57bf9b
@@ -37,13 +37,11 @@
 import org.apache.hadoop.fs.PathFilter;
 import org.apache.hadoop.fs.ProxyFileSystem;
 import org.apache.hadoop.fs.RemoteIterator;
-import org.apache.hadoop.fs.LocatedFileStatus;
-import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.fs.Trash;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.mapred.MiniMRCluster;
 import org.apache.hadoop.mapred.ClusterStatus;
 import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.MiniMRCluster;
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.WebHCatJTShim23;
 import org.apache.hadoop.mapreduce.Job;
@@ -362,10 +360,12 @@
public WebHCatJTShim getWebHCatShim(Configuration conf, UserGroupInformation ugi
           fs.listLocatedStatus(path);
       private FileStatus next;
       {
-        if (inner.hasNext()) {
+        next = null;
+        while (inner.hasNext() && next == null) {
           next = inner.next();
-        } else {
-          next = null;
+          if (filter != null && !filter.accept(next.getPath())) {
+            next = null;
+          }
         }
       }
 
